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

Change-Id: Id4e0626842a3d9f170e29a364f4d31020172f233