Merge "OMS: Setup state for users on boot and when added" into oc-dev am: 47fe4a0bef
am: c91893fb22

Change-Id: I86079fdfe1f632aa49b6a89b438e960f0db3caf9