fix. properly handle response using brokers.

Change-Id: I25c7dbc55c88ca6a9f0b3dee47b53196b78bfaae