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

Change-Id: I88e6f6e79a4af9dc619d05416583cc6564f0546c