[automerger skipped] Merge "L5 Metrics Addition:" into qt-qpr1-dev am: 9c16632a24
am: b0a6968f9d -s ours
am skip reason: change_id Id306d7cc27c9410a5ad73f5a0940c25f8d795686 with SHA1 bb613600fc is in history

Change-Id: I8f95783c22395e6734c522129d6698a874563bea