Fixes the lint issues now that the lint jobs fail properly. Change-Id: I78caa461fc9b2327a5d1ba39488f924f26da4354