Merge "Fix vulnerability in MemoryIntArray am: a97171ec am: fb12dd50 am: a5ee1090 am: 5250d906 am: 49e3ce48" into nyc-mr2-dev-plus-aosp