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

Change-Id: I70ecdee234a0949c586abed1529811bd4b9f2831