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

* commit '898e6973ca198f327059d331b4d83b1d183d5fb1':
  save "retain loader" state