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

Change-Id: I2005e918810e1602fd6d4b42c49a1eb54c613c66