Merge "Improve partial connectivity" am: f6cbc2d533
am: 270e77d930

Change-Id: Ie68acfe6e2182588cdd8b70d67651241573b2189