Merge "Restrict creation of secondary users" into rvc-dev am: 80542add04 am: 315330edb0

Change-Id: I0e67f03ce918ca35042fe3774d2b52519f3d7641