Merge in I9505_EUR_XXUAMDM