Merge "Add ApfCapabilities common test cases" am: ce5ecd9304
am: b7ed49dc0e

Change-Id: Icfd80943212430b2a0e6a4b55f53270cbc3d1693