Merge "Revert "Persists bubbles to disk (part 4)"" into rvc-dev am: a5cc646a19 am: 7c0341e6b9 am: 4461aa8fc8 am: 925ae859f2

Change-Id: Ia03770031ff9e640c428e6aa4e43b647f218bcb6