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

Change-Id: I4ca1d4f04ce249a3ccc43c529e3a3a39ec36f327