Merge changes from topic "StatsLog.write_migrate"
am: 32df8810c6

Change-Id: I5a5c6ac356fee904eb0b8707c667d90f98a8e095