Merge "Add some explicit error log messages" into gingerbread