Work on issue #30407061: OverflowArrayMap.stopObject unable to find object am: 657153bd28
am: ae7bdd8dde

Change-Id: Id9a3dfa2e18f62b2dc35396ae34ffb450ef8cbdc