am 0dc35830: (-s ours) am 8788c40c: am 75dcf510: Merge "Verify certificates" into klp-dev

* commit '0dc3583043bb578b149e50a9928894eff2819508':
  Verify certificates