Merge "configs: lahaina: Change device sku name for shima"