Put back invalidate optimization

Change-Id: I6407e452deb44e50a50632961e960cf0bd39b09d
2 files changed