Merge "HAL changes to PrimaryImei feature"