am 1f2bb46b: Merge change 6204 into donut

Merge commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f'

* commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f':
  Migrate to new keystore with the CertTool lib.