am 7f8f1e13: am 96619f9f: Merge "Add some error-case logging." into gingerbread

Merge commit '7f8f1e13d346bc2d645e9625660aae0c9ee1749d'

* commit '7f8f1e13d346bc2d645e9625660aae0c9ee1749d':
  Add some error-case logging.
tree: 0061922710ab79219fa5a02628ac94ce26f66298
  1. core/
  2. services/