Cleanup upgrades#353

oreo-collab wants to merge 18 commits intopi-apps:mainpi-apps/demo:mainfrom

oreo-collab:cleanup-upgradesoreo-collab/demo:cleanup-upgradesCopy head branch name to clipboard