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

* commit '203a6ddb0c098821ff36511e2a98211a90a69954':
  Verify certificates