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

Change-Id: I330872108b913695bfbabc9bbb907cebf47646aa