am b7f8b910: am 86aeb11e: Merge "load ro.recovery_id property from recovery partition" into mnc-dev

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