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

Change-Id: I1d550d75a37873ba460e14e99982ca48bc72d494