Merge "Fire ConnectivityDiagnostics callbacks on Connectivity reported." am: dd237cfd am: db42dddf Change-Id: I44d75efacebae77914eda6da7efaaf11676e71fc