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

Change-Id: I8b47225c8a6b3b7214b9b0a89971984d2f9fc9e3