am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one.

* commit 'd0b1977f7d12736a99a99893061948c622b5d8f3':
  Collapse multiple --extra-packages into one.