Merge "logd: correctly label identical lines" am: a9b5a5e96a am: 41e44283d2 am: d599f97ee5
am: 005ee6480c

Change-Id: I0e9f9e77cb2ee1db8296a47b52773a6c26aaa4eb