Merge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: 9eb7b974 am: 7674fe6a
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: 9eb7b974
DO NOT MERGE: Check number of attributes before writing to a buffer