Merge "Relabel /data/rollback files as enabling rollback (4/n)"