Fix incorrect comment, and move a variable close to use.

Change-Id: Ifd10df2d6ce3844fb676cfb5c294de170cf375bf
Merge "Fix incorrect comment, and move a variable close to use."