changes for 3G

Change-Id: I67f5d1edeb09eb061d45b549f1794c669a8891fb