am 1bec55bd: am d9c17cc1: merge from gingerbread

* commit '1bec55bd244f72c65fa254118a72ad3ed10aa845':
  Add more checks for bad values to protect from corrupt files.
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService