Merge "Fix a bug in saving local history of the metrics report." into qt-dev am: 6d647b78d3
am: c50eff6dba

Change-Id: I0e497562a621d35e117180c5f4c6998d8e58ba92