Change puerto rico to US

Change-Id: I114d7a98a0562e5edc47af4923eaa03820455f53
Merge "Change puerto rico to US"