Merge "Refactor CellInfo Constructors"
am: bd9da6de04

Change-Id: Id4958424a4a3d8b9e85b102b8ad8ad964d3ee7a2