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