Merge "Fix the build failure for iot targets in master-iot-dev" am: 6e7c4df7cc
am: 7887ff0b10

Change-Id: I3cf9e3ff4dfec75e6aeaa63785c519ccddf2a284