[automerger] DO NOT MERGE: Check number of attributes before writing to a...
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e9852 am: e24f24f3 am: 703cd5a1 am: 58304c3c
Change-Id: Ice70ef13544a1f93a9dafb71241141274b81a7f1