Bring up G2 to match CM fixes. Credit goes to CM

Change-Id: I081fb1d4497cb6f45c8cb3b3477a3ff3ab8fff3b