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

Change-Id: I98f792d178813cc93c0123ba73486d3d18a4874f