Merge "Fix labels on /data/system/shutdown-checkpoints/"