Merge "Updating CTS code to create user." into oreo-cts-dev