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

Change-Id: Id4974a613ba301c01bc8672b330afbc95ba348d8