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