Merge "Bump upstream versions" into 0.15.x