Merge "Update unified fstab.grouper to support recovery"