Enable multiple users

Change-Id: I318a7533568f9a28ec11e1bb8d1fe1e06a47700b
Merge "Enable multiple users" into cm-12.0