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

Change-Id: Iec6da43589f7ee023cca2cf0066c724930238e97