Merge changes from topic "nonab_on_vab_r" into rvc-dev am: b62ff1abe3 am: fbe98bb122 am: b4be26a02c am: adb68251d6 am: dc04d803d3

Change-Id: Ib70f59f5bc218ab82d3734e09760343e3188e35c