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

Change-Id: I5173d1c5f98ab658b2d195a38fa3009a4337e45f