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

Change-Id: If2dc382184f3e00f67838ed348d454f3a9b0bc41