apf: Tweak the interpreter data addressing scheme
am: d2cc2b74f1

Change-Id: I6099c2f5cdcaa771725fe934924929e76fd063e6