Merge "Refactor module registration" am: 348c437def
am: 578d579750

Change-Id: I57aac740aca7965c1d084e85a5081b457081729a