Merge "Restore amsterdam build job for demo repo"