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

Change-Id: I592468ee3d7bcc03b94d3e873388a7aa04e0ffc3