Merge "Incorporate upstream changes to v1.6.8."