Merge "cas: fix missing error code conversion" into oc-mr1-dev
am: e1333de647

Change-Id: I4767afc50305e53deb2c76c229eb25aca039a698