Merge "First pass at updated cache clearing logic." am: 45270e18cc am: fe40750da2 am: 19c96b49b5
am: 4aaed0fc6d

Change-Id: If99a870507c953ff92ac56653fe26cd7f29597d6