Hygiene: Fix jscs errors so I can merge again

Change-Id: I4cd67a6332af9717517fd01f80ca29f201b50a6b