Merge "Mark unused parameters as UNUSED in BRILLO." am: 1567662f5a
am: 002a0ffe14

Change-Id: I597292095289b14e1b2e4652e78344aa193bf26e