Merge "Upstream Configuration should also consider automatic configuration"
am: fad9571dc5

Change-Id: I9b4ae170dbeda9186dfae256871fa7e790a401e7