Merge "Refactor module registration" am: 0f9f1869a4 am: d0ca61072c am: 77571b4134
am: 5acf959652

Change-Id: I509a3271e583ca9fd5419309b46215ea0e82ab27