Merge "htcu12+: update device specific changes to account for OTA release 1.57.xxx.y from HTC"