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

Change-Id: I343c43fc5f9f18d2bc41f865cbbb8e6cf12a67bd