am bb2e1ef8: Merge "Fixing possible race condition."

* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
  Fixing possible race condition.