fix lint warnings

Change-Id: I6a066fd65b81000b5e47058da36586f1aa713dd3