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

Change-Id: Ia8c001f483f7bd753ebf5d6e3b459c812d6d8c4b