Revert "Persists bubbles to disk (part 4)"

This reverts commit 293b83d81ee2b537d2a8b5a1f81fce6270bd0d0c.

Reason for revert: May have caused http://b/156697897
Bug: 156697897
Change-Id: I9ce37a54abd25cc6a6dde2c7728d2da1076654c5
12 files changed