Fix race condition for cas sessions -- DO NOT MERGE
am: c927af1287

Change-Id: I1c84f2fd3d49a7e784b2b44d20453796d070df8d