Merge "Device management info: Refer to current user, not primary user" into oc-dev am: 57a0771bf5
am: 1e67d8902c
Change-Id: I32c82556b755aa4d5fdbde1492b1316578cf5b21
This commit is contained in:
57a0771bf5
am: 1e67d8902c
Change-Id: I32c82556b755aa4d5fdbde1492b1316578cf5b21