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

* commit '4b7c1cacca252f735d23f7e01885214630d83f32':
  Fixing possible race condition.