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

Change-Id: Ib5aa29687a05579af6a5d27b378746ee128d735d