Merge "Fix a cache calculation regression." into oc-mr1-dev am: fcd9565ec5
am: aed0474a6d

Change-Id: If9b4497b41f2f917ac1d2da18beca53fb854a454