Merge changes from topic 'HideMultiUser' into oc-dr1-dev
am: 3024de2536

Change-Id: I65d4d1f6cf04624188c30673013ece9bb61c94ec