Refactoring due to removing some private APIs.

Change-Id: Id00d9fa974d8cb747cebb99c5a64ed5b438b56e9
4 files changed