Merge "Remove useless workaround for HTC RIL bugs."