Merge "[Bug Fix] Not able to create secondary user due to lack of permission" am: 3addde7f6b am: 98c3040b52 am: 61cb8f964c

Change-Id: I19980209284d6740b576515bfd55ef09512bd648