am 23316a1e: (-s ours) am 00139b22: Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev

* commit '23316a1ef8868bc641ed72d42839c20b7b86fadb':
  Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE