Merge branch 'master' of https://gfiber-internal.googlesource.com/manifests into default

* 'master' of https://gfiber-internal.googlesource.com/manifests:

Change-Id: I433a498fae610cc8ffc0b7b415939909e148d222
tree: 76c1dd647e5f424928b242a7d8f0a07b19318939
  1. default.xml