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

* commit 'a2a5d4d043378b1a7e3630f89f182a32affac27f':
  Correctly parse previous PMBA state during backup