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

Change-Id: Ic07e59b4c05abcc70018d912a8f0cabd52cbf3a5