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

Change-Id: Idfa1f7c4f2bde288a2019ad94cf57bca78136b86