GS2 Common

Change-Id: I0ff8d86b1d73b61db5cbce1dba0f083d8fb04c22