Merge "Fix pre-existing lint error"