Merge "Add type to framework manifest file."