Merge "Additional metadata keys for Fast Pair"