am eef67346: Merge "Fix proxy expectation." into honeycomb

* commit 'eef673461bdbfbd8fde35c302ee5df5330f643a5':
  Fix proxy expectation.