Merge "Fix ValueMetric unit test." into qt-dev
am: f4d95b9959

Change-Id: Ic375904ca02b43f7105f4c3430edf98d10c9a842