Merge "Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46 am: 3ba72e71 am: 9afe3b12"