[automerger skipped] Create stats_buffer_writer am: 962cc23b9f am: bd0c0b9d63 am: 1b8ccd12c4 -s ours
am skip reason: Change-Id I0048e392c2f5039eb70dacf4e91a43d3f32e8749 with SHA-1 f9b24aef5f is in history

Change-Id: Ia280743184dd011c92c3f89de441daa1537005dc