Rebase to be against gproj-common

Change-Id: I397dc8879dad833eb3bf41a9184ad5a1b669ecb2