Add more logging around array sanity checks am: 3f4041b420 am: c7c7e5ae53

Change-Id: Iea1696d299b8aeb2cb04699b7e68382ab1acdfc5