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

Change-Id: I281525233a8b0ce2110843a63992ea9c62951b18