Merge "logd: CTS test"
am: 16214f2955

Change-Id: I77ca1c3fa6a5fa7569cc433bc419bebf5c5334ff