am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing...
am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
* commit 'c70fc4a3':
Don't crash if a system restore fails before constructing the PMBA