Merge "init: delete code that sets ro.recovery_id"