Add additional devices to list

Change-Id: Id36683c9cf3fe3c75dcfc10b8263efe0c289f6c6