Merge "Add some extra debug information because this error is only happening on the build server." into ics-aah