Merge "Move registration into android package"
am: 834a448aa9

Change-Id: I173db22be57f95a9ad905009da3ae615f7b359bb