Test: instrumentation (in master branch) Bug: b/36863239 Change-Id: I2f3b68ba3fac75b849ee99dc06d0a13478168b7e
54de77470d