diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
index 45bf4978f..954da1715 100644
--- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
+++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
@@ -590,6 +590,7 @@ public final class AvdManager {
             // priority order is:
             // - values provided by the user
             // - values provided by the skin
+            // - values provided by the target (add-on only).
             // In order to follow this priority, we'll add the lowest priority values first and then
             // override by higher priority values.
             // In the case of a platform with override values from the user, the skin value might
@@ -597,6 +598,16 @@ public final class AvdManager {
 
             HashMap<String, String> finalHardwareValues = new HashMap<String, String>();
 
+            File targetHardwareFile = new File(target.getLocation(), AvdManager.HARDWARE_INI);
+            if (targetHardwareFile.isFile()) {
+                Map<String, String> targetHardwareConfig = SdkManager.parsePropertyFile(
+                        targetHardwareFile, log);
+                if (targetHardwareConfig != null) {
+                    finalHardwareValues.putAll(targetHardwareConfig);
+                    values.putAll(targetHardwareConfig);
+                }
+            }
+
             // get the hardware properties for this skin
             File skinFolder = getSkinPath(skinName, target);
             File skinHardwareFile = new File(skinFolder, AvdManager.HARDWARE_INI);