Merge "Upgrade to 8.9.10" am: b9d468f637 am: d3aee739f5
am: 3aed0d351d

Change-Id: I352e65b514bcda2ba34fab24eb50cc42c6ec496f