Merge "added methods to @TestApi"