Merge "[DO NOT MERGE] Switch to using UMS.mUserStates" into nyc-mr2-dev