Merge "logd: statistics truncate name" am: 42d524f73d
am: 7f9719be48

Change-Id: I3751a3acb99562a20a1cdfe728e4e3fe210c69f9