Merge "Avoid reflection when mocking UserManagerService" into oc-dev