Follow framework refactoring.

Bug: 27531029
Change-Id: I21255335a776cdc7f47b09d110e8334803c414b7
2 files changed