Fix fallout of incorrectly merged review (3921)
Fix fallout of incorrectly merged review (3921)

This review was merged at the wrong patchset leaving some change behind.

Change-Id: I018accd516c73cc63cd9368df2daa9c389c93bc3

mikelikespie/bazel,spxtr/bazel,meteorcloudy/bazel,iamthearm/bazel,Asana/bazel,hermione521/bazel,dslomov/bazel-windows,mrdomino/bazel,kchodorow/bazel,mbrukman/bazel,LuminateWireless/bazel,ButterflyNetwork/bazel,perezd/bazel,katre/bazel,aehlig/bazel,abergmeier-dsfishlabs/bazel,LuminateWireless/bazel,katre/bazel,mikelikespie/bazel,kchodorow/bazel-1,cushon/bazel,dslomov/bazel-windows,damienmg/bazel,aehlig/bazel,ButterflyNetwork/bazel,snnn/bazel,cushon/bazel,LuminateWireless/bazel,bazelbuild/bazel,mbrukman/bazel,kchodorow/bazel,mbrukman/bazel,aehlig/bazel,damienmg/bazel,perezd/bazel,juhalindfors/bazel-patches,dslomov/bazel,ulfjack/bazel,mikelalcon/bazel,snnn/bazel,ButterflyNetwork/bazel,mikelalcon/bazel,spxtr/bazel,ulfjack/bazel,Asana/bazel,hermione521/bazel,dslomov/bazel-windows,damienmg/bazel,UrbanCompass/bazel,bazelbuild/bazel,mrdomino/bazel,Asana/bazel,perezd/bazel,cushon/bazel,katre/bazel,mrdomino/bazel,spxtr/bazel,cushon/bazel,iamthearm/bazel,dslomov/bazel-windows,variac/bazel,UrbanCompass/bazel,safarmer/bazel,mikelikespie/bazel,cushon/bazel,UrbanCompass/bazel,ulfjack/bazel,safarmer/bazel,davidzchen/bazel,mikelalcon/bazel,hermione521/bazel,variac/bazel,variac/bazel,iamthearm/bazel,werkt/bazel,davidzchen/bazel,dslomov/bazel,dropbox/bazel,davidzchen/bazel,perezd/bazel,snnn/bazel,abergmeier-dsfishlabs/bazel,twitter-forks/bazel,ulfjack/bazel,mrdomino/bazel,zhexuany/bazel,perezd/bazel,werkt/bazel,davidzchen/bazel,werkt/bazel,juhalindfors/bazel-patches,variac/bazel,hermione521/bazel,mbrukman/bazel,ButterflyNetwork/bazel,ButterflyNetwork/bazel,juhalindfors/bazel-patches,dropbox/bazel,kchodorow/bazel,kchodorow/bazel-1,hermione521/bazel,kchodorow/bazel,kchodorow/bazel-1,meteorcloudy/bazel,variac/bazel,werkt/bazel,dropbox/bazel,abergmeier-dsfishlabs/bazel,mikelikespie/bazel,twitter-forks/bazel,abergmeier-dsfishlabs/bazel,davidzchen/bazel,mikelalcon/bazel,Asana/bazel,juhalindfors/bazel-patches,perezd/bazel,abergmeier-dsfishlabs/bazel,dropbox/bazel,twitter-forks/bazel,iamthearm/bazel,mikelikespie/bazel,UrbanCompass/bazel,katre/bazel,kchodorow/bazel,dslomov/bazel-windows,bazelbuild/bazel,twitter-forks/bazel,meteorcloudy/bazel,kchodorow/bazel,hermione521/bazel,spxtr/bazel,mrdomino/bazel,dropbox/bazel,mrdomino/bazel,bazelbuild/bazel,mbrukman/bazel,juhalindfors/bazel-patches,bazelbuild/bazel,dslomov/bazel,snnn/bazel,perezd/bazel,snnn/bazel,zhexuany/bazel,twitter-forks/bazel,LuminateWireless/bazel,safarmer/bazel,akira-baruah/bazel,safarmer/bazel,kchodorow/bazel,zhexuany/bazel,meteorcloudy/bazel,dslomov/bazel,LuminateWireless/bazel,kchodorow/bazel-1,ulfjack/bazel,mikelalcon/bazel,juhalindfors/bazel-patches,meteorcloudy/bazel,aehlig/bazel,mikelalcon/bazel,kchodorow/bazel-1,iamthearm/bazel,aehlig/bazel,dslomov/bazel,twitter-forks/bazel,Asana/bazel,aehlig/bazel,ulfjack/bazel,akira-baruah/bazel,akira-baruah/bazel,mikelikespie/bazel,Asana/bazel,ulfjack/bazel,bazelbuild/bazel,snnn/bazel,Asana/bazel,spxtr/bazel,katre/bazel,damienmg/bazel,UrbanCompass/bazel,spxtr/bazel,spxtr/bazel,meteorcloudy/bazel,meteorcloudy/bazel,safarmer/bazel,mbrukman/bazel,davidzchen/bazel,damienmg/bazel,werkt/bazel,damienmg/bazel,akira-baruah/bazel,damienmg/bazel,aehlig/bazel,zhexuany/bazel,LuminateWireless/bazel,variac/bazel,variac/bazel,twitter-forks/bazel,dslomov/bazel-windows,zhexuany/bazel,dropbox/bazel,iamthearm/bazel,safarmer/bazel,katre/bazel,snnn/bazel,akira-baruah/bazel,dslomov/bazel,werkt/bazel,zhexuany/bazel,davidzchen/bazel,akira-baruah/bazel,abergmeier-dsfishlabs/bazel,cushon/bazel,juhalindfors/bazel-patches,UrbanCompass/bazel,ButterflyNetwork/bazel,kchodorow/bazel-1,dslomov/bazel