am 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."

* commit '6b497a0446ebad24305d5e29d5fd5e65014b9778':
  Fixing possible race condition.