am 3b99e64e: Merge change 8475 into donut

Merge commit '3b99e64e5899030b5d6f8201cb56cd149c80b24d'

* commit '3b99e64e5899030b5d6f8201cb56cd149c80b24d':
  Per conversation, remove the toast while saving the Certificates to CertTools.