Merge "Improve multi user functionality for restricted users" into rvc-dev am: f1fbba45d3
am: 48e8670c1f
am: 03d79f43ae
am: f625a044f2
Change-Id: I8d0c18c2264967f1c7ac389339de32254b292764
This commit is contained in: