Merge "load ro.recovery_id property from recovery partition"