Merge "Using the correct feature name for abb_exec."
am: 7922a44637

Change-Id: I5df21833dac791a3fdc18630847f159c3493b1a2