ch-pick  23737819c8 & cleanup build_id