DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
am: 5d2654124e  -s ours

Change-Id: I8cfbe35c719dc2f135ec695f346c555fb45dfa58