Merge "[rdkb][common][app][Refactor HQoS part to compatible with hnat]"