Merge "Move to release CAS for updating object fields"
am: 6559ba1cfb

Change-Id: Ib051409aa6e19c7a1a8564dd606da6b5c67cabf8