Merge "Track upstream change 796333a8."