Merge "fix CONFIG_SPATIAL_SVC warning"