Fix for possible race condition on kafka topic creation.

Change-Id: I083abbccc8eebc19ad4a23efba29b3c4c6ddd72f
Merge "Fix for possible race condition on kafka topic creation."