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

Change-Id: I5bb9a68ba6987e0c8a23a4663e929c49c321de3f