Merge changes from topic "nonab_on_vab_r" into rvc-dev am: 4d8e9cc847
am: 40a4a04a61
am: 328ee80a64
Change-Id: I9a135c760d8d24edccb7afccc59beff10846d751
This commit is contained in: