Fix and add in T-Mobile G2

Change-Id: I52dc65671b39542f8948fbbca36527a5d98b4f86