Merge "Enable PARTIAL_CONNECTIVITY dialog" am: 507d69d5d9
am: e2f6ad6b48

Change-Id: I2e1947cdf6e084aefd4d2ccd7b345df79c62e383