Take puerto rico out and put it in US

Change-Id: I67bc205d50e6dfe0b85b2e59167484338923260b
Merge "Take puerto rico out and put it in US"