Merge "Add @TestApi for field needed for test" into pi-dev am: d8a6f0cd94
am: 6f71d5f9e7

Change-Id: Idd27147d0e9a5bce573bca9dc607cbf97125b0bd