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

Change-Id: I040e0c5c5fba533a5b49ffe0aaa8008cfcc2c240