Merge "Don't include the dev-key on IOT products." am: 41febee0cc
am: b20d1d7a74

Change-Id: Id31abf9343870de33248269fe23b3c6c75ee7431