[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e9852 am: e24f24f3 Change-Id: I8df01c872458bbc8b4ab435855b6c76353c8dab7