Merge "Regression test for array aliasing bug." am: a7c2983783
am: 2a28a03fc3

Change-Id: I37c9ab4a2b164508c6139d77687197e3c387ddfb