Merge "Address comments on dumpsys network_stack version" into qt-dev