Merge \\"logd: trailing spaces in log statistics\\" am: d59d16a49d
am: 35f7799f16

Change-Id: Ice558919a34a1085c72cf47c270e7feeac89208d