Merge "fastboot: Fix snapshot-update merge behavior." into rvc-dev am: 4adbeb470f am: 10088dbe4e

Change-Id: I9e34906c541910d23d0fd986492a9621e5fbb909