Merge change 24439

* changes:
  Fix unnecessary GetPrimitiveArrayCritical users.