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

Change-Id: Ifc7e28ad5d81cbd6a3564631e65f4e281a2ed514