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

Change-Id: I732b85a7bb09bfa3d0ce6a70aed14e7e6aaefbfc