Merge "Revert "Add ability to have device-name based options""
am: 6247604714

Change-Id: I2eb019f6dd11b22cee8aa91c352822b0d7d1cf14