Merge "Use BidirectionalTopicClient from policy-common"