am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cert parameters optional."

* commit '888f5cb7166936f468831d64ac88197c15f0584f':
  Make specifying self-signed cert parameters optional.