Update devices from the Muppets

Change-Id: I31c5a1c313460e6f39302d21b284e3f5a238fb28