Add more logging around array sanity checks
am: 3f4041b420

Change-Id: I273ef6c561624fab6d20f3da60f68f91a0905202