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