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

Change-Id: Ia290ef28f466d6a5c3f7208b1bc078bd7a2c204a