DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest am: 5d2654124e  -s ours am: 2a2e22ab23  -s ours am: a053ead6a9
am: 8cc63f2554  -s ours

Change-Id: I6716477bad69ed0b490bde2e05a3b209899cbc36