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

Change-Id: I093a992e4888cccc11d8d982b2c7e7ec5fecf7ff