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

Change-Id: Ic0e6ee23717a48b82bc1e944c600bf83be760517