Merge "Fix lint warning for carrier & suggestion" into sc-dev