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

Change-Id: I737ab11ccd1bf6f92bae4eae21e67d4d6f86a758