[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE am: 58b9e7d73c  -s ours am: 21b4148129
am: dc5fdba156  -s ours

Change-Id: Id76725ecbab1d50b4d12f0b5c8fbf93d8ee56a6b