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

* commit 'e8956364a9cf4ec0f463768a6116fdcda8635b13':
  Don't leave stale normalized number when updating...