[lint] Import fixes

Change-Id: Ica9cf62d046b0090c786a32ee329422acd46a11e