[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before...
[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev am: a86ef46c am: be3ea93c
am: 158fb64f -s ours
Change-Id: I979219abffdf2fa7e851dcc326931c1c25d219fa