Merge "Add userId to the package name API." am: dcc401b7b7 am: 443d3d0f11
am: ba20c10d2c

Change-Id: I6584c26c2c9df0a778d6d34fd122d096781cca38