Fix jshint errors

Change-Id: Iee9a0803feef793143d8da9e4d1dbcf885c096f6
Merge "Fix jshint errors"