Merge "add zte esr-thirdparty-sdnc discovery logic"