Merge "Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d am: b1e2bfe4df am: 8a956a5141" into pi-dev