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

Change-Id: Ibff88fa7c23dfb2ce2430ba4d639ad09f0be928f