Merge changes I54360698,Ic8a3db21

* changes:
  Finish removing N/A DO disclosures from search index
  DO Disclosures: Combine personal and work CA cert