[automerger skipped] Merge "Take module APIs out of the module_current stubs"...
[automerger skipped] Merge "Take module APIs out of the module_current stubs" am: b7a4febf am: 94d3569c -s ours am: cb82e089 -s ours
am skip reason: Change-Id Ia39b2686de7619ccb1ec154588c11a8b1b322647 with SHA-1 822cdb30 is in history
Change-Id: Ibbd60abb72addfdb7cff5997d1ac3973648cff47