Remove console.log and fixed a couple of jsduck errors

Change-Id: I03c1d370fbe563285aa844639deadd676ef24014
Merge "Remove console.log and fixed a couple of jsduck errors"