Merge changes from topics "vab_allocate", "vab_wait"
am: d0c62b9dab

Change-Id: I001d22b54f22f0fd8a4943e72b3294b59bdf92ee