[automerger skipped] Retire FixedBuffer am: c57fe51f93 am: 546b6fea86 am: 13e9bc8fcc -s ours

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

Change-Id: I849902a6c79b7aba991f29ac85570ad5f027ae3f