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

Change-Id: I7d5a5bc87232a19e075f346003e9c3ef37b36b87