Merge "Update GBP jobs to use Ubuntu 16.04 GBP image"