[IOT-1785] Merge branch 'iot-1785'
authorKevin Kane <kkane@microsoft.com>
Fri, 31 Mar 2017 19:59:42 +0000 (12:59 -0700)
committerKevin Kane <kkane@microsoft.com>
Fri, 31 Mar 2017 19:59:49 +0000 (12:59 -0700)
Change-Id: I9f8270ab9643dcf203b9fbcd20a37ee482659e16
Signed-off-by: Kevin Kane <kkane@microsoft.com>

Trivial merge