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

Change-Id: I7febc52d94c1249b76608853d5cc142cdb8ad9df
tree: 9160878529de45d60419e7ba1e2ee41dc57a1aab
  1. core/
  2. services/
  3. tests/