Merge "Revert "Persists bubbles to disk (part 4)"" into rvc-dev am: a5cc646a19

Change-Id: I5f91f1b4d7c919d9024f096a841a3bc23c705c9d