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