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

Change-Id: I9c740b1b4e760266853f7f813dfa096df8098de7