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

Change-Id: I4893e1c558216aaddaecb4abb82f9ea505e885dc