Merge "L5 Metrics Addition:" into qt-qpr1-dev
am: 9c16632a24

Change-Id: If50095321517893b805b6ca02150c2c2fd210aab