[automerger skipped] Retire FixedBuffer am: c57fe51f93 -s ours am: 86f36c4abb -s ours am: ab2a0f02f7 -s ours am: 311215568e -s ours

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

Change-Id: I3de21f67d4c3cd77a963500e45f5efeb8f3c94f9