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

Change-Id: I07945e97fbdd495e038b8445d47f5f47debb5c0b