Upgrading arrays to 5.4 short syntax

Change-Id: I1a238996a3a8ab56fa0282cddc51c06f5c9bd139