Merge "Update codeMap for v5.8 kernel update."