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