Merge pull request #9812 from adityaduggal/wrong_state_codes

Changed state codes and added state