Merge "[automerger skipped] Merge "DO NOT MERGE Switch to system user before running CtsOsTestCases module." into pie-cts-dev am: bb8361ff20 -s ours am skip reason: subject contains skip directive"