Code corrections to silence jslint

 - Split multiple varaiable definitions in one line into one definition per line

Change-Id: Id2659ae02218decd0645a22cccfe271fbb8be04b
Merge "Code corrections to silence jslint"