Merge remote-tracking branch 'upstream/release/3.0' into release/3.0
authorMike McLaughlin <mikem@microsoft.com>
Tue, 13 Aug 2019 05:40:48 +0000 (22:40 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Tue, 13 Aug 2019 05:40:48 +0000 (22:40 -0700)

Trivial merge