Restore device name and resolution

Remove unused patches

Change-Id: I461b23daac3cdefbe4a275633b3d90d13d11a4f0