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

Change-Id: I447c194f8f83cdec00760889f8c8f9278daf0ead