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

Change-Id: I69258e0cb237f501e2962f216396889ec0521098