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

Change-Id: I36d82c22f98cd86625a88ac3d2cef5255e104e4b