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

Change-Id: Ic8b73d8fa8bf482372587d229f1cace25a44cbb2