Fix array ordering random, prod config changes

Change-Id: I3a2ee61a59336e3697284be4d4c5e3a855000f2a