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