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

Change-Id: I22092d07dcbbfd9ae8b85033c294aa49f3c62c90