This is necessary to avoid collisions between same usernames used service users. Depends-on: I4fbfa8fba84b11c4e30e4db9a0c358db1e8c94f1 Closes-Bug: #2030755 Change-Id: I500fd131cbd6cd5c2b38fdbe81b8b48e50a3e3f7 (cherry picked from commit86a323abfe) (cherry picked from commit4794204031) (cherry picked from commitbdf00de606)