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

Change-Id: I780bcfe0f27ac6858bc6870e3518e0866f4f70fc