Merge "Convert apct/text/text_native_test-cloud-tf to Test Mapping Suite." am: d65f2d3274 am: eac7720922

Change-Id: I6e65a6782d6f873beba6c620b53d595e412b1ca3