Lint cleanup

Change-Id: I349611e38c20511910194b06fe9cae3cf3639fb1
3 files changed