Merge "Refactor module registration"
am: 0f9f1869a4

Change-Id: I0aab16aa2d38f6eac9eaf863f53a2d45ca05c38b