Merge "Merge "Add CellInfo converter V1_4" am: 40aa75d3da am: 5e89327544" into pi-dev-plus-aosp
am: e49f842053

Change-Id: I0300e9c78a7910eb066da3782a58ded6c71256d6