Merge "Upgrade to 8.8.10" am: 8036dacac2
am: eadb89f888

Change-Id: I9be728f341bff7b41186d9f4e0cd47cb83060aff