Try some tuna that fits in better with our build

Change-Id: Ic8b082169ef42c98b5e30c48243959626dab66ee