am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev

* commit '30260c7e93fa5d5a08c505e1b804849bb56b83f1':
  Verify certificates