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

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