Merge changes from topic 'logcatd -L' into oc-dev am: c155fbedf2
am: c994283821

Change-Id: I85c0e2a5ed88db85a4d07b7aa2260ae334cd4ae9