Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev