am ab9a3588: Merge "Revise stash for BBOTAs when needed."

* commit 'ab9a3588011ebe62eb18e425de02a50fe919b645':
  Revise stash for BBOTAs when needed.