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

Change-Id: I19dc82eaed5c62d4697cd6f884cc71a62639b0f4