Merge "Add @TestApi for field needed for test" into pi-dev