Merge "Lint fix: IS_DEBUG_DEVICE: Implied default locale"