Merge "Schedule  agentDisconnected() in handler thread" am: c02a4a4613 am: 72a838e704 am: 18d0df806e
am: f053fc7133

Change-Id: Ice34a562d184b5228f7ffa2adf47a5e9c1e37a82