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

Change-Id: Ie742319b19334b540488722827e2f4aa8236ad96