more overlay changes and add Device options

Change-Id: Ib595727f2eb11c164e562cea122ea103683dd428