Avoid race condition when Sessions are finished

Bug: 13550276
Change-Id: I813f601a54708cd291cb0524c7b63724bd9c9fb8
3 files changed