Merge "Fix unittest that checks build id"