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

Change-Id: I39a0612821ba0a12a36521726a30de8256ae81e0