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

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