Merge "Adjust APF interpreter tests to match APFv4"
am: 05011abf27

Change-Id: I5ca2b41ab6c101bef7465229270079c81743c757