Fix lint warnings

Change-Id: If8fa48d4e1b5327f825913a8420d20070e6bef88
2 files changed