Merge \\"logd: Replace logd with chatty log tag\\" am: 596e65db60
am: 607f55de91

Change-Id: Ic5e1f21c94f4cd40a9c601817b58e8a2636d4bba