Merge "Fix the build failure for iot targets in master-iot-dev"