Merge "[DO NOT MERGE] Switch to using UMS.mUserStates" into nyc-mr2-dev am: 3c5965d339
am: ba9883173a  -s ours

Change-Id: I0f598cd310707627b9758465fc5b8eca58eb5367