Merge "[spatial svc] Remove hard coded rc_end_usage setting"