Merge changes from topic "vab-extended-metrics" into rvc-dev am: 622a727f9a am: 3476f56b57 am: dac88efb5a

Change-Id: Ie17956a840771df68cbdb6b7b97deed9c2dbcfe6