am dd20fc48: Merge "Fix CertPath APIs"

* commit 'dd20fc483e31ff20b5da95d37b4106150cd7c6b0':
  Fix CertPath APIs