some commits about wunused warnings

Change-Id: I6d3bfa5dd9b137314a1d5e7e6893f3c80586ae18