Merge "Upgrade to 8.8.0" am: 6b5ff49a91
am: 395b4c51c3

Change-Id: I5f2c89174b4ac24b4ee71be21cd337f6236c9b2a