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

Change-Id: I44e8a1e98fe6418597768c8da810d29cdeac5379