Merge "Add workaround for invalidation bug on API 21-22" into mnc-ub-dev
am: 0799afc

* commit '0799afc163bd5d8f9bfd6869e451c4be5640c971':
  Add workaround for invalidation bug on API 21-22

Change-Id: Ib1450fdbc7832b158464e6603177faa11720500a