Merge "Dedup registration code for module types and singletons"
am: 65b174c9c7

Change-Id: Ifd8ea4278057e36d6555aa47fc3f21c28121ccfb