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

Change-Id: I52fcb4103b0119ed6039a53374703e1d7af0bc12