Merge "Merge "Fix usermanager related tests." into nyc-mr1-dev am: bb883ddf59" into nyc-mr1-dev-plus-aosp