[DO NOT MERGE] Switch to using UMS.mUserStates am: 7a1e682794
am: ea3345d6a6  -s ours

Change-Id: I1e2c20c6b6c4f40fcf7cb69b4571838f2fbceef8