Merge "Avoid IllegalStateException by calling next before remove" into main

            Iterator<Entry<Pair<Integer, String>, AdiDeviceState>> iterator =

                    mDeviceInventory.entrySet().iterator();

            if (iterator.hasNext()) {

                iterator.next();

                iterator.remove();

            }

        }