Merge "Drop -Wno-unused-parameter." am: a0e9742796
am: 6cadc73dea

Change-Id: Ib9bb6362481315466c12575b62900bf61747eafc