Merge "Revert "Fix vulnerability in MemoryIntArray am: a97171ec49" am: 43966dafb3 am: 498547ec6c am: ef435f6780 am: 31f2e91892" into nyc-mr2-dev-plus-aosp