am de7f8a61: am f0f2aaa9: Merge "Incorporate upstream changes to v1.6.8." * commit 'de7f8a61ae8c5141262ad00f7ae1e61baa41c59c': Incorporate upstream changes to v1.6.8.