Merge "Fix proxy expectation." into honeycomb