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

Change-Id: Iaa6df9ed55006544542adb17223a3ca79de9010c