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

Change-Id: Ie45ffcbbf7bc4d4b596245118c8a15064aa8edd3