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

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