Merge "Revert "Revert "Add ability to have device-name based options""" am: a30af164 am: a0f8f206 am: 33aad594 Change-Id: I5e354400fc1a57e91f3d7ac9e260d596416c815c