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

Change-Id: I4b6c57e2bc8a478c754a075c861d6585e58e4b48