Merge changes from topic "nonab_on_vab_r" into rvc-dev am: 4d8e9cc847
am: 40a4a04a61
am: 05f0a7bfd3
Change-Id: I108d7698087b3bde202080f7c9ad026c6618a2b4
This commit is contained in: