Merge "Don't crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev