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