Merge "Add type to framework manifest file." into oc-dev