Merge "Enable @TestApi access for instrumentation."