Merge "Support setting upstream parameters." am: faf8d67749
am: 4e5024131b

Change-Id: I150015ea0c66be50e79f641f20d1752b9d60cb0d