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

Change-Id: Ic4dd6c6be03f97648e55b452dab84c253c22ecdf