Merge "Add test where aget on potential null array fails verification." am: 60b4077274
am: bc7e58fe57

Change-Id: I962d6ebf68b908a3c961f6eca6efbc6165a23bdd