Merge "fix logic bug in assertArrayEquals"