[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE am: c927af1287 am: ebbcb99ca1  -s ours am: c61b35c29b  -s ours
am: 11f23b2478

Change-Id: I1ae4220d4a9e32101ade3d450027aec82e431170