Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authorrtrimana <rtrimana@uci.edu>
Mon, 5 Aug 2019 19:36:38 +0000 (12:36 -0700)
committerrtrimana <rtrimana@uci.edu>
Mon, 5 Aug 2019 19:36:38 +0000 (12:36 -0700)

Trivial merge