Follow framework refactoring.

Bug: 27531029
Change-Id: Ib2339aad1d4266e3cfbe49eb2f469740272a09bb
2 files changed