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

* commit 'd2347a89fb1a01f550a1b17c68ee234958c1be42':
  Dedupe trust anchors