Merge branch '2022-01-28-fastboot-updates'