am 3d561748: am ec035950: Merge "Clean up -p handling slightly."

* commit '3d5617487c07f1fcbdf23755e0ca01559e3c5f3b':
  Clean up -p handling slightly.