Merge "logd: CTS test" am: 16214f2955 am: fddaec1e2c am: d492d04c45
am: b9f9b7c500

Change-Id: I94308d996bb244a1c8c417e98062272b2ea82420