Merge "Silence warning about unused variables in BRILLO." am: bcd87f5969
am: ca59abe191

Change-Id: Ic2e37c41dad8579cdcd28e6698fce991854c7962