Merge "logcat: test: inject() tuning" am: 26a714a0ab am: 7acdb2c9e3 am: 74aa911277
am: 7fa16297ab

Change-Id: I3d34ed68dcb5224cb1810feb85438cd0b7f1ab43