Merge "Merge "Defer deleting a http cache" am: c294af5f94 am: 1aeed34905" into pi-dev-plus-aosp