Merge "Add cgroups.recovery.json into recovery image"