Merge "lakitu: Enable GENEVE required by bq"