Merge "Address comments on NetworkStack AIDL v6"