Another GzOne port fix

Change-Id: I811a57a75bb467696e09d425769ee5a903f32ac5