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

Change-Id: I7d37b7fd2c1819c5108d1adc545e161b86ab0979