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

Change-Id: I7db422cf1a470f0ec1d68e80be9d4631e2727b44