Fixes jslint and doxygen errors introduced in Ie12d526 and I57a6ad9

Change-Id: I3e597bc89360f7e491cfdc258509be287490d2d3
Merge "Fixes jslint and doxygen errors introduced in Ie12d526 and I57a6ad9"