Merge "Upstream Configuration should also consider automatic configuration" am: fad9571d am: 3effe3a7 am: 0e8bcbfe Change-Id: I251c1b659b6cf7f1057ae01065efa520404ce78c