Merge "removed oran and gran devmgr features"