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

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