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

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