Merge "make log.tag.stats_log work for stats buffer." am: 1e2ed53ffc
am: 9e28024b42

Change-Id: I63b2072f2781c3bbd71df94d1492c9b4ee0ea3ce