Further jshint fixes

Bug: 47161
Change-Id: I0710fd5fb9ce8ad21b7d3a45834fa8955944e433
Merge "Further jshint fixes"