am 1b96f013: am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev

* commit '1b96f013a02409195278be23a19d57289f26c7fe':
  Revert "Clarify handling client certificates"