Merge "Remove @TestApi annotation" into oc-dev