Merge "init: delete code that sets ro.recovery_id" am: 8a5943b37d
am: 9684bccca1

Change-Id: I98d9a632a2274aa5be2b9e3c7d4e848425bacb07