Merge "Handle IndexOutOfBoundsException for IMEI & MEID substring"