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

* commit '8788c40c7b5bdcaef1dcaa7f36598ae767880047':
  Verify certificates