Merge "Split chooseUpstreamType() into two separate functions" am: 7a42d3ad83 am: f6d55d7e9e
am: 8eb1fbf1bc

Change-Id: Ia8fd663404f1d0a70243ab9c9bd853ac6d51d68f