Merge "Improve multi user functionality for restricted users" into rvc-dev am: f1fbba45d3 am: 48e8670c1f am: 799c90caef am: 4a524a0e2b am: 7565628dd4
Change-Id: I3a885f512c4ec5c34f77acd7f2dbbcfd54d270f9
This commit is contained in: