Merge "Add ability to have device-name based options"
am: 2875173c75

Change-Id: I5b03482183ac141986e4f6362d6815c67098f2df