Merge commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696' into gingerbread-plus-aosp * commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696': Add some error-case logging.