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

Change-Id: I8a799188f0fe64952386c178eb3f303615fa13ef