Cleanup for jslint and coding conventions

Change-Id: I6884759d9622220721840f44220648dce7838ff6
Merge "Cleanup for jslint and coding conventions"