fix flash overlay and add Device options

Change-Id: Ied8d472060662cdd0895778c5724b27af940d254