Make FIFO guarantee optional

Change-Id: Ia360356db98f170fe4396f649d76e583c60f319a