Merge "Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014 am: 9aed2f6f53" into nyc-mr2-dev-plus-aosp
am: b7e7eb2e0f

Change-Id: Id8099ba1fcf1db8f6dfda8da2037a3c5707588ef