am e9fd9b23: am 1da6b1fe: Merge "load ro.recovery_id property from recovery partition"

* commit 'e9fd9b23cbc0c0aa3919b3e06871ad98ecb0d33b':
  load ro.recovery_id property from recovery partition