am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev

* commit '02087754fb49de7421b982267a283482b70bc297':
  Fix race condition and disable call.