Merge "Don't use free list LOS for --force-determinism." am: 9459127abb
am: e51846563a

Change-Id: I88de0a8903684cabcc63e04e26b54609eee4ee03