Rebase to be against gproj-common

Change-Id: I06096f1d8bc3740eb9cc1d25962398c77a6e6807