am c4b7088f: am 42a23783: Merge "Add more checks for bad values to protect...
am c4b7088f: am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
* commit 'c4b7088f':
Add more checks for bad values to protect from corrupt files.