Merge "Dedupe trust anchors" am: 690b5f6c0a
am: e2caaea951

* commit 'e2caaea951e62a21bb1d30450e8085f3286ea538':
  Dedupe trust anchors