Merge "Improve multi user functionality for restricted users" into rvc-dev am: f1fbba45d3
am: 9939490139
am: 7980b1675c
Change-Id: I684600fa01ff155f2dd1d973e650d20623554b36
This commit is contained in: