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

* commit '6e34793b9cf11237670a5daa320cd784f7442532':
  Fix code style, put unused in the end