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