am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"

* commit '5abe06bf8bfed0c15dc56b6d2cd30cc10c898153':
  Fix code style, put unused in the end