Merge "Adjust to upstream buck and new bucklet version"