Follow framework refactoring.

Bug: 27531029
Change-Id: I31febc145c65ff4e11b522717119d16852a7e387
3 files changed