Merge \\\"Let caller handle NoSuchAlgorithmException.\\\" am: 8427083a26 am: a1daa9d537
am: 7f58c5d8f0

Change-Id: I46e349c6921425e6c0cdc9eb1ce14fb5d78bfd0d