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

Change-Id: I4798aac3a0fd42d66444c018609e46ea340b80f9