am 10d7803c: Merge "Avoid race condition when Sessions are finished" into gb-ub-photos-denali

* commit '10d7803c6638992c97d2f7400b52fd3f695c8d1a':
  Avoid race condition when Sessions are finished