Applying HTC 2.04 Upstream patch