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

Change-Id: I034b22fff0c4510d604cee8c5a353994b3c097e3