Merge "Track default upstream when system is ready" am: d9eeba6fd1
am: 8e4f9929e7

Change-Id: I36d2eb778603ea68cca43bfe9103b25ab8bb4d37