Merge changes Idc8486ae,I295f4099

* changes:
  Add recovery_available option
  Limit the exported functions