Merge "Update comment to use CAS-specific error codes" am: cc5daca6e4
am: a9d0f6a32b

Change-Id: I46da9183a1c45ea567fc83a3db6f0fd08b3bb7ca