Merge "Fixed JSON output for Stagehand" into devel/master
authorDavid Steele <david.steele@samsung.com>
Thu, 21 Jun 2018 21:25:43 +0000 (21:25 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 21 Jun 2018 21:25:43 +0000 (21:25 +0000)

Trivial merge