Merge \\\"Move away from custom created attrs arrays DO NOT MERGE ANYWHERE\\\" into nyc-dev am: 4ef9dec967  -s ours am: 66a6da351c  -s ours
am: a5f8293064  -s ours

Change-Id: I5d1368412eebd3f734220881d13b9a3484cc5ea1