Merge "Expose some APIs as test APIs to facilitate CTS" am: 3649374e17
am: ebf53906de

Change-Id: I2300f31f0ea58c6aa7c50573c5a8f4955f72f15a