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

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