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

Change-Id: I833bd4ba55f64f355fc5bdd05380d804d75e3cc0