am 36be5c6a: am 6490e80e: Merge "save "retain loader" state" into mnc-dr-dev

* commit '36be5c6adc664da215b490986b23ffd12459b97d':
  save "retain loader" state