Hygiene: JSDuck cleanup

Change-Id: Ia54e1c26d5ecf2fcc75626f01a04cbbe2297f151
Merge "Hygiene: JSDuck cleanup"