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

Change-Id: I6572b04e66c4b0e59dfe9a2374e78a277c40e169