Merge "Don't leave stale normalized number when updating..." into jb-mr1-dev