am 75dcf510: Merge "Verify certificates" into klp-dev

* commit '75dcf5101c90e31bbac95694d835b0e8f57ba720':
  Verify certificates