Merge "Added @TestApi to some TaskInfo.java methods"