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

Change-Id: Id4f02a4bab02fe5e7a81255da1d292a51ef38e2e