Merge "resourceloader: Reduce width of module hash from 7 chars to 5"