am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev

* commit '41b0cbb3a6e6e51ae75a971c3c6b6e36950a2bf5':
  Correctly parse previous PMBA state during backup