commit repaired manifests
diff --git a/full.xml b/full.xml
index 917a050..acc6024 100644
--- a/full.xml
+++ b/full.xml
@@ -1,190 +1,190 @@
 <manifest>
   <include name="_remotes.xml" />
-  <default remote="cros" revision="refs/heads/firmware-octopus-11297.B" sync-j="8" />
+  <default remote="cros" sync-j="8" />
   <notice>
 Your sources have been sync'd successfully.
   </notice>
 
-  <project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" />
+  <project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="refs/heads/firmware-octopus-11297.196.B" />
   <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks" />
 
-  <project name="chromiumos/docs" path="docs" />
-  <project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" />
-  <project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite">
+  <project name="chromiumos/docs" path="docs" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="refs/heads/firmware-octopus-11297.196.B">
     <copyfile dest="AUTHORS" src="AUTHORS" />
     <copyfile dest="LICENSE" src="LICENSE" />
   </project>
-  <project name="chromiumos/infra/bad_cl_detector" path="infra/bad_cl_detector" />
-  <project name="chromiumos/infra/dummies/general-sandbox" path="infra/dummies/general-sandbox" />
-  <project name="chromiumos/infra/dummies/merge-sandbox" path="infra/dummies/merge-sandbox" />
-  <project groups="chromeos-admin" name="chromiumos/infra/ci_results_archiver" path="infra/ci_results_archiver" />
-  <project name="chromiumos/infra/cl_exonerator" path="infra/cl_exonerator" />
-  <project name="chromiumos/infra/cl_status_viewer" path="infra/cl_status_viewer" />
-  <project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" />
-  <project name="chromiumos/infra/logstock" path="infra/logstock" />
-  <project name="chromiumos/infra/lucifer" path="infra/lucifer" />
-  <project groups="chromeos-admin,labtools" name="chromiumos/infra/skylab_inventory" path="infra/skylab_inventory" />
-  <project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" />
-  <project name="chromiumos/infra/test_analyzer" path="infra/test_analyzer" />
-  <project groups="minilayout,firmware,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" />
+  <project name="chromiumos/infra/bad_cl_detector" path="infra/bad_cl_detector" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/infra/dummies/general-sandbox" path="infra/dummies/general-sandbox" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/infra/dummies/merge-sandbox" path="infra/dummies/merge-sandbox" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="chromeos-admin" name="chromiumos/infra/ci_results_archiver" path="infra/ci_results_archiver" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/infra/cl_exonerator" path="infra/cl_exonerator" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/infra/cl_status_viewer" path="infra/cl_status_viewer" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/infra/logstock" path="infra/logstock" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/infra/lucifer" path="infra/lucifer" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="chromeos-admin,labtools" name="chromiumos/infra/skylab_inventory" path="infra/skylab_inventory" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/infra/test_analyzer" path="infra/test_analyzer" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="refs/heads/firmware-octopus-11297.196.B" />
   <project groups="buildtools,chromeos-admin,firmware,labtools,minilayout" name="infra/luci/client-py" path="chromite/third_party/swarming.client" remote="chromium" revision="281c390193ec8c02e60279f8dac1b86ac52fa4be" />
-  <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="536f6cb9217032dfd1d4cdbfc35b5d1c316cec27" />
+  <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="refs/heads/firmware-octopus-11297.196.B" />
   <project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="920588a1acdc4721abb713d8162010e4b85ae53e" />
   <project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="c3e17727c6ac127b0033ef011cb07c08385f448f" />
-  <project name="aosp/platform/system/core/libsync" path="src/aosp/system/libsync" revision="f4f4387b6bf2387efbcfd1453af4892e8982faf6" />
-  <project groups="devserver" name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="e3183927f68f1ec2c7bc9c21e48c55c618aabd2a" />
-  <project groups="minilayout,firmware" name="chromiumos/overlays/board-overlays" path="src/overlays" />
-  <project name="chromiumos/platform2" path="src/platform2" />
-  <project name="chromiumos/platform/experimental" path="src/platform/experimental" />
-  <project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" />
-  <project name="chromiumos/platform/assets" path="src/platform/assets" />
-  <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" />
-  <project name="chromiumos/platform/battery_updater" path="src/platform/battery_updater" />
-  <project name="chromiumos/platform/bisect-kit" path="src/platform/bisect-kit" />
-  <project name="chromiumos/platform/bmpblk" path="src/platform/bmpblk" />
-  <project name="chromiumos/platform/bootcache" path="src/platform/bootcache" />
-  <project name="chromiumos/platform/btsocket" path="src/platform/btsocket" />
-  <project name="chromiumos/platform/cfm-device-monitor" path="src/platform/cfm-device-monitor" />
-  <project name="chromiumos/platform/chameleon" path="src/platform/chameleon" />
-  <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" />
-  <project name="chromiumos/platform/cobble" path="src/platform/cobble" />
-  <project name="chromiumos/containers/cros-container-guest-tools" path="src/platform/container-guest-tools" />
-  <project groups="minilayout,firmware,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" />
-  <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" />
-  <project groups="firmware" name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" />
-  <project groups="minilayout,firmware,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" />
-  <project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" />
-  <project groups="firmware" name="chromiumos/platform/ec" path="src/platform/ec" />
-  <project name="chromiumos/platform/factory" path="src/platform/factory" />
-  <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" />
-  <project groups="firmware" name="chromiumos/platform/firmware" path="src/platform/firmware" />
-  <project name="chromiumos/platform/frecon" path="src/platform/frecon" />
-  <project name="chromiumos/platform/gestures" path="src/platform/gestures" />
-  <project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" />
-  <project name="chromiumos/graphyte" path="src/platform/graphyte" />
-  <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" />
-  <project name="chromiumos/platform/inputcontrol" path="src/platform/inputcontrol" />
-  <project name="chromiumos/platform/jabra_vold" path="src/platform/jabra_vold" />
-  <project name="chromiumos/platform/libevdev" path="src/platform/libevdev" />
-  <project name="chromiumos/platform/microbenchmarks" path="src/platform/microbenchmarks" />
-  <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" />
-  <project name="chromiumos/platform/moblab" path="src/platform/moblab" />
-  <project name="chromiumos/platform/mosys" path="src/platform/mosys" />
-  <project name="chromiumos/platform/mttools" path="src/platform/mttools" />
-  <project name="chromiumos/platform/newblue" path="src/platform/newblue" />
-  <project name="chromiumos/platform/punybench" path="src/platform/punybench" />
-  <project name="chromiumos/platform/tast" path="src/platform/tast" />
-  <project name="chromiumos/platform/tast-tests" path="src/platform/tast-tests" />
-  <project name="chromiumos/platform/tremplin" path="src/platform/tremplin" />
-  <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" />
-  <project name="chromiumos/platform/touchbot" path="src/platform/touchbot" />
-  <project groups="firmware" name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" />
-  <project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" />
-  <project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" />
-  <project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" />
-  <project name="chromiumos/platform/dm-verity" path="src/platform/verity" />
-  <project groups="firmware,buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" />
-  <project name="chromiumos/platform/vpd" path="src/platform/vpd" />
-  <project name="chromiumos/platform/webplot" path="src/platform/webplot" />
-  <project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" />
-  <project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" />
+  <project name="aosp/platform/system/core/libsync" path="src/aosp/system/libsync" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="devserver" name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform2" path="src/platform2" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/experimental" path="src/platform/experimental" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/assets" path="src/platform/assets" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/battery_updater" path="src/platform/battery_updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/bisect-kit" path="src/platform/bisect-kit" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/bmpblk" path="src/platform/bmpblk" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/bootcache" path="src/platform/bootcache" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/btsocket" path="src/platform/btsocket" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/cfm-device-monitor" path="src/platform/cfm-device-monitor" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/cobble" path="src/platform/cobble" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/containers/cros-container-guest-tools" path="src/platform/container-guest-tools" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/platform/ec" path="src/platform/ec" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/factory" path="src/platform/factory" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/platform/firmware" path="src/platform/firmware" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/graphyte" path="src/platform/graphyte" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/inputcontrol" path="src/platform/inputcontrol" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/jabra_vold" path="src/platform/jabra_vold" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/microbenchmarks" path="src/platform/microbenchmarks" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/moblab" path="src/platform/moblab" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/mosys" path="src/platform/mosys" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/mttools" path="src/platform/mttools" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/newblue" path="src/platform/newblue" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/tast" path="src/platform/tast" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/tast-tests" path="src/platform/tast-tests" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/tremplin" path="src/platform/tremplin" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware,buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="refs/heads/firmware-octopus-11297.196.B" />
 
-  <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" />
-  <project name="chromiumos/third_party/android_mtdutils" path="src/third_party/android_mtdutils" />
-  <project name="chromiumos/third_party/mesa" path="src/third_party/arc-mesa" revision="refs/heads/firmware-octopus-11297.B-arc-18.2.0-pre1" />
-  <project name="chromiumos/third_party/arm-trusted-firmware" path="src/third_party/arm-trusted-firmware" />
-  <project name="chromiumos/third_party/atheros" path="src/third_party/atheros" />
-  <project name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" />
-  <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" />
-  <project name="chromiumos/third_party/aver-updater" path="src/third_party/aver-updater" />
-  <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" />
-  <project groups="firmware" name="chromiumos/third_party/bootstub" path="src/third_party/bootstub" />
-  <project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" />
+  <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/android_mtdutils" path="src/third_party/android_mtdutils" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/mesa" path="src/third_party/arc-mesa" revision="refs/heads/firmware-octopus-11297.196.B-arc-18.2.0-pre1" />
+  <project name="chromiumos/third_party/arm-trusted-firmware" path="src/third_party/arm-trusted-firmware" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/aver-updater" path="src/third_party/aver-updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/bootstub" path="src/third_party/bootstub" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="refs/heads/firmware-octopus-11297.196.B" />
   
   <project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="a89bf7903f3169e6bc7b8efc10a73a7571de21cf" />
-  <project name="chromiumos/third_party/broadcom" path="src/third_party/broadcom" />
-  <project groups="firmware" name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" />
-  <project groups="minilayout,firmware,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" sync-c="true" />
-  <project groups="firmware" name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" />
-  <project groups="firmware" name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" />
-  <project name="chromiumos/third_party/cros-adapta" path="src/third_party/cros-adapta" />
-  <project groups="firmware" name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" />
-  <project name="chromiumos/third_party/cups" path="src/third_party/cups" />
-  <project name="chromiumos/third_party/cypress-tools" path="src/third_party/cypress-tools" />
-  <project name="chromiumos/third_party/daisydog" path="src/third_party/daisydog" />
-  <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" />
-  <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" />
-  <project name="chromiumos/third_party/displaylink-updater" path="src/third_party/displaylink-updater" />
-  <project groups="minilayout,firmware,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" />
-  <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="refs/heads/firmware-octopus-11297.B-chromeos-2017.08" />
-  <project groups="firmware" name="chromiumos/third_party/em100" path="src/third_party/em100" />
-  <project groups="firmware" name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" />
-  <project groups="firmware" name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" />
-  <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/fsp/cnl/edk2" revision="refs/heads/firmware-octopus-11297.B-chromeos-cnl" />
-  <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/fsp/glk/edk2" revision="refs/heads/firmware-octopus-11297.B-chromeos-glk" />
-  <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/fsp/icl/edk2" revision="refs/heads/firmware-octopus-11297.B-chromeos-icl" />
-  <project name="chromiumos/third_party/fwupd" path="src/third_party/fwupd" />
-  <project name="chromiumos/third_party/gdmwimax" path="src/third_party/gdmwimax" />
-  <project name="chromiumos/third_party/gobi3k-sdk" path="src/third_party/gobi3k-sdk" />
-  <project groups="labtools" name="chromiumos/third_party/hdctools" path="src/third_party/hdctools" />
-  <project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" />
-  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="refs/heads/firmware-octopus-11297.B-chromeos-3.8" />
-  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="refs/heads/firmware-octopus-11297.B-chromeos-3.10" />
-  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="refs/heads/firmware-octopus-11297.B-chromeos-3.14" />
-  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="refs/heads/firmware-octopus-11297.B-chromeos-3.18" />
-  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="refs/heads/firmware-octopus-11297.B-chromeos-4.4" />
-  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.14" revision="refs/heads/firmware-octopus-11297.B-chromeos-4.14" />
-  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.14-mistral" revision="refs/heads/firmware-octopus-11297.B-chromeos-4.14-mistral" />
-  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.19" revision="refs/heads/firmware-octopus-11297.B-chromeos-4.19" />
-  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/experimental" revision="refs/heads/firmware-octopus-11297.B-next/chromeos-experimental" />
-  <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" />
-  <project name="chromiumos/third_party/kvmtool" path="src/third_party/kvmtool" />
+  <project name="chromiumos/third_party/broadcom" path="src/third_party/broadcom" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" sync-c="true" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/cros-adapta" path="src/third_party/cros-adapta" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/cups" path="src/third_party/cups" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/cypress-tools" path="src/third_party/cypress-tools" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/daisydog" path="src/third_party/daisydog" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/displaylink-updater" path="src/third_party/displaylink-updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-2017.08" />
+  <project groups="firmware" name="chromiumos/third_party/em100" path="src/third_party/em100" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/fsp/cnl/edk2" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-cnl" />
+  <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/fsp/glk/edk2" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-glk" />
+  <project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/fsp/icl/edk2" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-icl" />
+  <project name="chromiumos/third_party/fwupd" path="src/third_party/fwupd" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/gdmwimax" path="src/third_party/gdmwimax" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/gobi3k-sdk" path="src/third_party/gobi3k-sdk" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="labtools" name="chromiumos/third_party/hdctools" path="src/third_party/hdctools" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-3.8" />
+  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-3.10" />
+  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-3.14" />
+  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-3.18" />
+  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-4.4" />
+  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.14" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-4.14" />
+  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.14-mistral" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-4.14-mistral" />
+  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.19" revision="refs/heads/firmware-octopus-11297.196.B-chromeos-4.19" />
+  <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/experimental" revision="refs/heads/firmware-octopus-11297.196.B-next-chromeos-experimental" />
+  <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/kvmtool" path="src/third_party/kvmtool" revision="refs/heads/firmware-octopus-11297.196.B" />
   <project name="apps/libapps" path="src/third_party/libapps" revision="03ee0980444a38a97ef947b2272e44fdb3bdf5f5">
     <annotation name="branch-mode" value="pin" />
   </project>
-  <project name="chromiumos/third_party/libc-bench" path="src/third_party/libc-bench" />
-  <project name="chromiumos/third_party/libdrm" path="src/third_party/libdrm" />
-  <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" />
-  <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" />
-  <project name="chromiumos/third_party/libqrtr" path="src/third_party/libqrtr" />
-  <project name="chromiumos/third_party/libscrypt" path="src/third_party/libscrypt" />
-  <project name="chromiumos/third_party/libsigrok" path="src/third_party/libsigrok" />
-  <project name="chromiumos/third_party/libsigrokdecode" path="src/third_party/libsigrokdecode" />
-  <project name="chromiumos/third_party/libv4lplugins" path="src/third_party/libv4lplugins" />
-  <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" />
-  <project name="chromiumos/third_party/logitech-updater" path="src/third_party/logitech-updater" />
-  <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" />
-  <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" />
-  <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="refs/heads/firmware-octopus-11297.B-master" />
-  <project name="chromiumos/third_party/mesa" path="src/third_party/mesa-img" revision="refs/heads/firmware-octopus-11297.B-mesa-img" />
-  <project name="chromiumos/third_party/mimo-updater" path="src/third_party/mimo-updater" />
-  <project name="aosp/platform/external/modp_b64" path="src/third_party/modp_b64" revision="99dc13926931cedfd2e4e582c33ef657d0645c5c" />
-  <project name="chromiumos/third_party/mmc-utils" path="src/third_party/mmc-utils" />
-  <project name="chromiumos/third_party/modemmanager-next" path="src/third_party/modemmanager-next" />
-  <project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" />
-  <project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" />
-  <project groups="minilayout,firmware,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" />
-  <project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" />
-  <project name="chromiumos/third_party/realtek-updater" path="src/third_party/realtek-updater" />
-  <project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" />
-  <project groups="firmware" name="chromiumos/third_party/seabios" path="src/third_party/seabios" />
-  <project name="chromiumos/third_party/libsigrok-cli" path="src/third_party/sigrok-cli" />
-  <project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" />
-  <project name="chromiumos/third_party/sound-open-firmware" path="src/third_party/sound-open-firmware" />
-  <project name="chromiumos/third_party/sound-open-firmware-tools" path="src/third_party/sound-open-firmware-tools" />
-  <project groups="firmware" name="chromiumos/third_party/sysbios" path="src/third_party/sysbios" />
-  <project name="chromiumos/third_party/tlsdate" path="src/third_party/tlsdate" />
-  <project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" />
-  <project groups="firmware" name="chromiumos/platform/tpm" path="src/third_party/tpm" />
-  <project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" />
-  <project groups="firmware" name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" />
-  <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" />
-  <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" />
-  <project name="chromiumos/third_party/webrtc-apm" path="src/third_party/webrtc-apm" />
-  <project name="chromiumos/third_party/whining" path="src/third_party/whining" />
-  <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="refs/heads/firmware-octopus-11297.B-master" />
-  <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant-2.6" revision="refs/heads/firmware-octopus-11297.B-wpa_supplicant-2.6" />
-  <project name="chromiumos/third_party/virtual-usb-printer" path="src/third_party/virtual-usb-printer" />
+  <project name="chromiumos/third_party/libc-bench" path="src/third_party/libc-bench" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/libdrm" path="src/third_party/libdrm" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/libqrtr" path="src/third_party/libqrtr" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/libscrypt" path="src/third_party/libscrypt" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/libsigrok" path="src/third_party/libsigrok" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/libsigrokdecode" path="src/third_party/libsigrokdecode" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/libv4lplugins" path="src/third_party/libv4lplugins" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/logitech-updater" path="src/third_party/logitech-updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="refs/heads/firmware-octopus-11297.196.B-master" />
+  <project name="chromiumos/third_party/mesa" path="src/third_party/mesa-img" revision="refs/heads/firmware-octopus-11297.196.B-mesa-img" />
+  <project name="chromiumos/third_party/mimo-updater" path="src/third_party/mimo-updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="aosp/platform/external/modp_b64" path="src/third_party/modp_b64" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/mmc-utils" path="src/third_party/mmc-utils" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/modemmanager-next" path="src/third_party/modemmanager-next" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="minilayout,firmware,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/realtek-updater" path="src/third_party/realtek-updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/libsigrok-cli" path="src/third_party/sigrok-cli" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/sound-open-firmware" path="src/third_party/sound-open-firmware" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/sound-open-firmware-tools" path="src/third_party/sound-open-firmware-tools" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/sysbios" path="src/third_party/sysbios" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/tlsdate" path="src/third_party/tlsdate" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/platform/tpm" path="src/third_party/tpm" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project groups="firmware" name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/webrtc-apm" path="src/third_party/webrtc-apm" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="refs/heads/firmware-octopus-11297.196.B" />
+  <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="refs/heads/firmware-octopus-11297.196.B-master" />
+  <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant-2.6" revision="refs/heads/firmware-octopus-11297.196.B-wpa_supplicant-2.6" />
+  <project name="chromiumos/third_party/virtual-usb-printer" path="src/third_party/virtual-usb-printer" revision="refs/heads/firmware-octopus-11297.196.B" />
   <project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="15b13f7fcb85ad0f8ce4ffe582b4bbdb07be7f84" />
 
   <project name="weave/libweave" path="src/weave/libweave" revision="a852917ec1d1ada705a0a71deaf419af190f268c" />
@@ -208,6 +208,6 @@
   <project name="platform/external/puffin" path="src/aosp/external/puffin" remote="aosp" revision="6d30f049ed4cfc5d4bfa4fdbf6529c9e3522e951" />
 
   
-  <project name="chromiumos/manifest" path="manifest" />
+  <project name="chromiumos/manifest" path="manifest" revision="refs/heads/firmware-octopus-11297.196.B" />
 
 </manifest>
\ No newline at end of file