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

Change-Id: If58973432347f5dab5a73f9c48f5693913c3bbaa