Merge changes from topic "nonab_on_vab_r" into rvc-dev am: b62ff1abe3

Change-Id: Icb9c84e10f0a9723abbb087b28a6b066a3363d0c