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