[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 skip reason: Change-Id Ia39b2686de7619ccb1ec154588c11a8b1b322647 with SHA-1 822cdb30 is in history
Change-Id: I77b21b8f5d155e56e70d82cd53c94036308829be