Merge "logcat: test: tail_# occasional failures" am: e7b335b471 am: a1f43ebf89
am: e8b5dca8c2

Change-Id: I0a47af262457d7de1d35d1e2dabfaf80fb70e4be