Merge \"Work on issue #30407061: OverflowArrayMap.stopObject unable to find object\" into nyc-mr1-dev
am: 29cc1b6939

Change-Id: I7495da9e5fd41cf3fac42dc0dd79baa97d32f637