Merge "Fix reference to ProxyInfo extra" am: 4c4bd56e95

Original change: undetermined

Change-Id: I2f1673a6df4b0b11e0f4e961956c198124f2780e