[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)
commita73131d051307dd846f5e9f249cf73444fcdb8e7
tree788c6c1a5712520a823349243476015293fceb0d
parent94b86083c1f59b9fab19538488ea6c9f08c3b3d1
parentc21b6f5a05cc41eb347f2022a1b2a4bbfb4df93e
[IOT-1785] Merge branch 'iot-1785'

Change-Id: I9f8270ab9643dcf203b9fbcd20a37ee482659e16
Signed-off-by: Kevin Kane <kkane@microsoft.com>