Merge "Fix invalidation workaround" into mnc-ub-dev
am: b878633

* commit 'b878633128a0533d843edcc7c086155bbddb4db8':
  Fix invalidation workaround

Change-Id: Icbb200907e08833848a98d8eae6c3201f882cc0c