Merge "Marking some hidden API as TestApi." into pi-dev
am: 50c069f7c1

Change-Id: I9fc4f78ed60d066eba840413b40b88c60b4c5d1a