am 5ee94621: Remove references to global proxy APIs

* commit '5ee9462101672a2c75fa92c5d4055ab4622f80e8':
  Remove references to global proxy APIs