Merge "Move to release CAS for updating object fields" into oc-dev
am: 08afdf41ac

Change-Id: I29418a59e8d50ef6914645a2f81e96de78752a31