Merge "Remove unused a.t.InstrumentationUtils" am: 0e4f1358d6
am: 08c12d21f5

Change-Id: I46ab06228623aa4e350b1285761e062e1d7393c0