TIMOB-12848: Added changes to get HTC phones working again.