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

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