Merge "Adjust APF interpreter tests to match APFv4" into pi-dev am: 580a1ed904
am: 260dc7fdf5

Change-Id: Ia8677ff90a2eb8c21cabd1e105680e6e3b4eb374