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

Change-Id: I93d516f7a63bf2c3d8d2925bf287c4cba74b74f9