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

Change-Id: I59dc67b32d19570357b69d82c7ce771000ffa64f