Merge "Mark methods as @TestApi"