Follow framework refactoring.

Bug: 27531029
Change-Id: I01e15252dff413f49dfc4f31735e557cad51cc77
4 files changed