Merge "Refactor module registration"
am: 348c437def

Change-Id: I813d625749c6c6b5b63df6f6a170c92a97a1c1f6