Merge "Defer deleting a http cache" am: c294af5f94
am: 1aeed34905

Change-Id: I69a34d1e9662fd46574fe75a76fa7eb1b92ba055