Merge "Mark CTS-tested APIs as @TestApi" into pi-dev