Updated GA code.

Change-Id: Ifa7f8254b2c81f0c3ab8a79338197c2308d6c1de