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

Change-Id: I6b9b69d289f46398599df25c13a14bec52e5dd6e