changes for 3G

Change-Id: I9defc3909d7bf6a6cc983cc2d3ea09d1e16d799d