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

* commit '432ab6ac04f22a5e4c15aece04117b35bbf8869c':
  Fixing possible race condition.