Added HTC Vendor and Passion support