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

Change-Id: I27755cf706e3fe4d131d372173b4ffe78deb821b