De-lint.

Change-Id: Id0f64bb2563b139856b0522183142201c2869fe7