Merge "Add PRODUCT_IOT to the list of product vars." am: e90295014f
am: c4ca4c41f8

Change-Id: I2f4abbdd47baa21f1e3f55c6a61e6f1b32aaeb3e