Rebase to be against gproj-common

Change-Id: I2b82a6fdaab0685e16344f2a7b0fbd8261715f17