Merge commit '68f591b17537cb437ca0b25d00a6d3d08e507abb' into eclair-plus-aosp * commit '68f591b17537cb437ca0b25d00a6d3d08e507abb': Try not to crash the system server because of corrupt restore data
Merge commit '68f591b17537cb437ca0b25d00a6d3d08e507abb' into eclair-plus-aosp * commit '68f591b17537cb437ca0b25d00a6d3d08e507abb': Try not to crash the system server because of corrupt restore data