Merge "logd: remove failing test." am: dc0f5bc4f4
am: 36c9d53cae

Change-Id: I9abcb442ac057bc002c5567110989bbe26e259ef