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

Change-Id: Ib1b52a3f1082ce6f6d6087080e3e1bc5677f5026