Merge "Update branches for stable/rocky"