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

Change-Id: Icd1e8795e53315c4b361eed06d786df410f6b177