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

Change-Id: Ib93efa140aab170df9495292b41f0b6af9211f2e