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

Change-Id: Ia437299ab7d069eafb2e35063e2b0c3b43c6543a