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

Change-Id: I72c041051f3bd1735a438f8ce7ded83cf26136f9