Merge "Persists bubbles to disk (part 1)" into rvc-dev am: 92703c0e2a am: cd3c722e50 am: 043bcffbd5
Change-Id: I254b94dc86eab813f8d265a9f14db05fb9c753fd
This commit is contained in: