Merge "Persists bubbles to disk (part 5)" into rvc-dev am: 7e8d487ea4

Change-Id: I8c373a8f7ec5e6ee1446f2a4b11aa7f43ee8e605