Merge "Add empty baseline files for system_service api"