Merge "Add CellInfo converter V1_4" am: 40aa75d3da
am: 5e89327544

Change-Id: I3c0770c76f3462173c934ec0318ae84295e79255