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

Change-Id: Ib1edbe4cb9c05c515ba3c35da92529d4715999f9