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

* commit '8faa9e9e349011aebab6527476e315f6a5f610e4':
  save "retain loader" state