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

Change-Id: If0d8f5a0e54a71899c2f878c61747223579bf24a