Merge "Support partial connectivity probe result option" am: da0ebedb47
am: cca7cdc8d9

Change-Id: Ic1ea01ee3d6ac2f01f843fbf71684b6f7b21bd41