Merge "Deal gracefully with empty srcs." into nyc-dev