More updating

Change-Id: I8c5d8a5f1c4f1292dbd6cdfa16e5d68132e34ba1
Fixing the 3g Fix commit

Change-Id: I3e5e07a819c796cda29a89a8b70d0b8b0e5d91c2