Follow framework API changes

Change-Id: I3cc9d782b93413ffeb0e76c9d9ce790a10a97ea5
4 files changed