Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev...

            return;

        }

        Set<Map.Entry<String,Object>> entries = val.entrySet();

        writeInt(entries.size());

        int size = entries.size();

        writeInt(size);

        for (Map.Entry<String,Object> e : entries) {

            writeValue(e.getKey());

            writeValue(e.getValue());

            size--;

        }

        if (size != 0) {

            throw new BadParcelableException("Map size does not match number of entries!");

        }

    }

    /**