Merge "Verify That Reported CellInfo Type is Known"
am: 2c6e6b85bf

Change-Id: Ic2e3841fc9e73941ead22b20e88f8d5d7bf607cd