Merge "Replace mdsal model bundles with feature"