Merge "Fix the NPE thrown when starting Ethernet service in OS lower than T." into tm-dev