Merge "Hide User category if only one user in device" into oc-dev am: 55a3944dbf
am: b5dafb6c10

Change-Id: I9dd993c03395565cf5b3355e60a568eed08c7857