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

Change-Id: I0b16f7fa272b7a6a0cc7a32d48f22304ce0074d0