Merge "snapshotctl: merge when boot" am: 8c055fbe3e
am: bd859add84

Change-Id: I2b065d652aa2a7ea0b992cea49626fee34623852