JSHint: Too many var statements

Change-Id: I8431035f5ab99392b2803826026bb23db0bbdec7
Merge "JSHint: Too many var statements"