am e23ed8c6: Merge "Remove useless workaround for HTC RIL bugs."

* commit 'e23ed8c6441389a79c6504295184f7249e01a197':
  Remove useless workaround for HTC RIL bugs.