Support array classes in profiles. am: f5e26f8f83
am: 115a3025c2

Change-Id: I6961c91d455a6c90008531d6a982346144340876