Merge "Upgrade to 8.8.0"
am: 6b5ff49a91

Change-Id: If583487438f6bdef7643bd2a8cd762df962e10bb