am 0664c62c: Merge "Motorola request to fix proxy" into honeycomb

* commit '0664c62c12b885d1c5029185623299f73b048f88':
  Motorola request to fix proxy