Add and Fix all devices

Change-Id: I15d3d9c888cab2280437dd17d105b34691ad14b8