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

Change-Id: I59597bd9c700439ca67f8a6ab9b055492a5dda29