Merge pull request #6830 from illume/upstream-build-manifest-platform-metadata