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

Change-Id: I1a7d7e94aad1a2b02b1ccf2874f0e5bc2e0b4dc5