Merge "Revert "Fix vulnerability in MemoryIntArray am: a97171ec" am: 43966daf am: 498547ec am: ef435f67 am: 31f2e918" into nyc-mr2-dev-plus-aosp