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