Merge "Refactor Cell Location public API." into jb-mr1-dev