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

Change-Id: I2a1fb43b4be3f3e3c90ca073afc4cb101e7a8e08