Merge "To update the yardstick stable branch."