Added htc vendor support