Rebase to be against gproj-common

Change-Id: I3ba730dac69c28487d3c998198a6311ccf876eae