Merge "Merge "Support setting upstream parameters." am: faf8d677 am: 4e502413 am: e2018a40 am: 6ce08f62"