Merge \\"Revert \\"logcat: expand -n, -r and -b\\"\\" am: 8c60f2dcfe
am: 92b14b06f3

Change-Id: I868b3190b6f3b00886edf4176a674748c5279ea3