Follow framework API changes

Change-Id: Idda69badd6405fe6ddff1d3f4b8ea06332ac3360
3 files changed