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

Change-Id: Ibb019c022848836e52cbbb7e9a0ebbbc7fc13cea