[automerger skipped] Retire FixedBuffer am: c57fe51f93 am: 546b6fea86 -s ours am: 59fbe2983e -s ours am: 36448e05fb -s ours

am skip reason: Change-Id I51fc5cb2ea12dd3cc5868fb18429774a8493e12f with SHA-1 57e93517e4 is in history

Change-Id: If4f3a40daf6100ace2c559e6f03e1ae328fa5b06