Merge "Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4 am: 4675ff1d9b" into rvc-qpr-dev-plus-aosp