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

Change-Id: I6c0bfd1ac72e38a388215f55b9b96d58fa641c3d