Updates to support jsduck 5.x

Change-Id: I16123e91370cb6a7785060c749530953f4c3ddf4
Merge "Updates to support jsduck 5.x"