Merge changes from topic "RemoveTempStatsLogWrite" into qt-dev
am: a0ee2c4e20

Change-Id: I0ef6781e4d374e0e1e9a6779f0eb2eae87d27bfe