GzOne port try

Change-Id: I4e5239481512b2e3235afd6732644c1995d94027