Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Ensure in-memory model matches state committed to All-Projects

Change-Id: I0d778129348f59b9979ad9a72188c1f4e2bbabe9