Merge "fastboot: Fix snapshot-update merge behavior." into rvc-dev