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

Change-Id: I49b9f615f15af2fb52d3d39b50f47a1aae326429