Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev