Merge "Refactoring due to removing some private APIs."