Merge changes from topic "nonab_on_vab_r" into rvc-dev am: b62ff1abe3 am: 492abcd14b am: 21a720e19f am: 5a093cfd72

Change-Id: Ica88f0b0b0423b96cff89647a34aa772b12c856f