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

Change-Id: Ia77f28b93287aba3d6df806e0753642e3b5a1f00