Merge "Show existing CP2 information for invalid numbers even if out of date." am: db6f12ef3e
am: 9da270e481

Change-Id: I16e3afe38476066b1d92308c41863734a2ba3017