Merge changes from topics "vab_allocate", "vab_wait" am: d0c62b9dab am: dbdfc27520 am: 0d962baeea

Change-Id: I10c7a1e44f818487e3c63b937399f5edd9d929e8