Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev
am: 5c53c6c6f5

Change-Id: I06c3ae928d8008ec5afd04acb4ad439736933606