DO NOT MERGE Workaround for java.lang.IllegalArgumentException in android.util.ArrayMap am: a94a117971
am: 6819cc2f0e  -s ours

* commit '6819cc2f0e31da6e768139d26970ff4796a0e9d1':
  DO NOT MERGE Workaround for java.lang.IllegalArgumentException in android.util.ArrayMap