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

Change-Id: I6a97138b8e801b22c95d9e737738135a3575bfd8