am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev

* commit '739bb7c694aee521995100c456cf1c8341820bec':
  save "retain loader" state