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

Change-Id: I04b3f4a130f611c917f478e7c31b857a413641b7