Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev