Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authorrtrimana <rtrimana@uci.edu>
Sat, 3 Aug 2019 17:18:35 +0000 (10:18 -0700)
committerrtrimana <rtrimana@uci.edu>
Sat, 3 Aug 2019 17:18:35 +0000 (10:18 -0700)

Trivial merge