Merge "Add the second IMEI tag"