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

Change-Id: Ia47d8a2e797924ec39900747c5d5891e37a0d1ca