Galaxy S 4G support based on Bryan's work.

Change-Id: I5ec4f95979856bb76c4d072ea82c8e97e35775dd