Move registration into android package am: 96548c9ee0 am: 35d3a30a29
am: cc484fb676

Change-Id: I13b0fee8920c0d4a83b284f0b2e1a14b78f74d9f