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

Change-Id: I95c296644d8b0e233183bf3b9bf64e17a78255bd