Merge "Use fallback build id if jar version is null" into nyc-dev