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

Change-Id: I104e7185dc940a432c63d974e011783bb100242c