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

Change-Id: I126b659e8feae06fbf9deebad519d4c2ce754a84