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

Change-Id: Ib4b1691f1710f57a9a589ac977d556c1f61e63a5