Merge "Avoid ClassCastException in ArrayMap." into oc-dev