Merge "Fixing the metrics_constants jump" into qt-dev
am: c29e230514

Change-Id: I0a72a3f4409fa50041fee6edbd86d6712b555429