merge from g2-common

Change-Id: I5ae3984e15949d2b9704b097351f8a4fd284a1e6