Merge "Improve partial connectivity"
am: f6cbc2d533

Change-Id: I19c41c88d32643f82531c7afc3d4248ef9b44b53