Merge "Refactor CellInfo Constructors" am: bd9da6de04 am: 1d2825ce8e
am: 47872bf7e5

Change-Id: Ief5578fa6a5020d553c4d2c64cce2066667bb65f