Merge "Add a way to get a string for an error code." into gingerbread