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

Change-Id: I3c05f917a9c492ab8c652b70f3e16ad03f297a07