Merge "Change COMAC local POD key"