Merge "Persists bubbles to disk (part 2)" into rvc-dev am: d0166e437e

Change-Id: I82cb35965b4e0b523a6d8ba99d22c5624e3ea366