am cd781ce2: am cb6f950f: Merge "New internal API to eliminate poke locks." into jb-mr1-dev

* commit 'cd781ce2ebc104cf83d630889ae330a980635c9e':
  New internal API to eliminate poke locks.