Merge "Defer deleting a http cache"
am: c294af5f94

Change-Id: I29ef61d60774fc26596878d56455cc7a3c5e0236