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

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