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

Change-Id: I7febc52d94c1249b76608853d5cc142cdb8ad9df