Merge "First pass at updated cache clearing logic." am: 45270e18cc
am: fe40750da2

Change-Id: I54afc93c8d39857a63906b0cb8ec72f4aba4f6d4