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

Change-Id: I2eda02ea14fb67b1a0192750ae3885ec89f14564