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

Trivial merge