Merge with latest changes from https://github.com/AICP/platform_manifest