Merge "Move variable declaration on its own line"