Merge "Handle logd reconnect." into pi-dev
am: 2e0f45f087

Change-Id: I15cdb063331da9b1e6479d598314fb1cf05ab9f1