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

* commit 'd347d519766e80b27c4f469f391c388c78f75373':
  Fix race condition and disable call.