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

Change-Id: I76b035a84dd184b2ff92fc175df383bc9983f616