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

Change-Id: Ic35f21a7cae9c3463d89d78e5f1c4bd883bdd3e1