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

Change-Id: Id506137e17980fbff8bc1f3c5ed2e0942e07c14a