am 0cd2472b: am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread

Merge commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f'

* commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f':
  Add some explicit error log messages