apf: Tweak the interpreter data addressing scheme am: 17c1fbc9e9
am: 091ea8c192

Change-Id: Id238d258f5895cb8b389c05c738f28fe09006eae