changes for 3G

Change-Id: I42467db2c7eb8f27f7559190f9026a65dff292b5