am cee8425f: Merge "Move variable declaration on its own line"

* commit 'cee8425f22cfe268614c7bb47b2f5874ac6a0e4b':
  Move variable declaration on its own line