Merge branch 'PatchEmptyCache_release' into release

Change-Id: I0f3d838aad855e780efbac3645a0fea5d3e8f540
Merge branch 'ImproveMemoryUseOfMattesReimplement' into release

Change-Id: Ida71af825d9965dec08c202d5409e275166ae0ab
Merge branch 'release'

Change-Id: I30d49e4432e51e5db21ddc31a862bf6484c4aa04