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

Change-Id: I8fcfee2b12e467b8d7b3dc778ed0218b73ad44a0