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

Change-Id: I5dbdbb2a0f5235600ec2ffac9cc222ce486a67d3