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

Change-Id: I9ca3a1d9dc2033f103ec7480995dcf05f75b9e6d