Merge changes from topic "logcatd-shell" am: 0ae1272269 am: c05bd7b402
am: 4cd9470731

Change-Id: Ie2b5e98b4aea78af51b6b4f16271ee4d1348533f