Merge "Add new module-lib APIs for MTS testing" am: b9e3e9e34c am: 876c59823e

Change-Id: I3c0a9d1c87889085d142a150a672f27624a6e851