Merge "Fix vulnerability in MemoryIntArray am: 1181f448c1 am: d08cf2b071 am: 385277305e am: ff112f6ad2" into nyc-mr2-dev-plus-aosp
am: 54aa4655a5

Change-Id: I0db640687a0ed18744ea3224fd8302aeaf94fa70