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

Change-Id: I3256df0a0359628f6cffe3e24379f9a461600747