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

Change-Id: I30f58b527a6d7b34e36da1b2a548f9495da41a7b