g2 common - further aosp fixup.

Change-Id: Iedf1507f9c6906b0af2cbfe595484f546c1321d3