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

* commit '2aa909f0ab017e17d8397f18b8c2c6dc0ec150a4':
  Correctly parse previous PMBA state during backup