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

Change-Id: I19b2024dd7510dcbf9d17733c056a704e270ab94