Revert "Add some more gov's"

This reverts commit 15ad7e8e0bda89c253e24c1cbd06fc77fb105d5a.

Change-Id: I9303f279eb1864a8f8491e227495c3d129d1fcd2
Merge "Revert "Add some more gov's"" into android-4.4