Merge "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 6023fd1800 am: 61705a3e64  -s ours"