Merge "libconnectivity_native add null check"