Merge "Migrate convertHalCellIdentityToCellIdentity()" am: b50e6ceeb0 am: eeaba5f024

Change-Id: Iddee535691122b59b2ece88f3c11f44b05110cee