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

Change-Id: I2e6c97a2340b55dc8795767706c15588da1048f8