Merge "Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 am: 7986672c6f" into rvc-d1-dev-plus-aosp