Merge branch 'stable-3.2' * stable-3.2: Adapt the test code to not mock cache instances Change-Id: Ifc012e2c89a68df94fd80f1f669cea5832c02354