Merge "Move registration into android package"