Merge changes from topic "stats_log" am: 68f2c85354 am: 11bb6bbf41
am: 9ecaaf44f9

Change-Id: I17e28078354548b375d60a44a32cc7bd39d895be