am b284da94: Merge "Add InstrumentationUtils"

* commit 'b284da9483474581abc25a8cc822b4dadf2dfa34':
  Add InstrumentationUtils