Merge "DO NOT MERGE: Fix ApfTest"
am: 05f0bfe33e  -s ours

Change-Id: If9eb248254cafc6ec4ce10fb5a402282b7e3512c