Start with original g2-common and merge 1 by 1

Change-Id: I8fe2f01712dae26492891c01b878171e16086bb0