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

Change-Id: Iacfebbfe9f0a823f2ae9b96f7dded8d6158af446