Merge "Fix lint warning"