Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authorrtrimana <rtrimana@uci.edu>
Tue, 6 Aug 2019 22:09:43 +0000 (15:09 -0700)
committerrtrimana <rtrimana@uci.edu>
Tue, 6 Aug 2019 22:09:43 +0000 (15:09 -0700)

Trivial merge