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

Change-Id: I7d148c69b253a9ee10e73e30dc81ec4fc51fa4f4