Merge "Upgrade to 8.9.10"
am: b9d468f637

Change-Id: Ibd559395c1fe72d6bd7fdc61112011f9d2009c1f