Merge "Update CTS to use bubble naming; adds BubbleMetadata tests"