Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authorrtrimana <rtrimana@uci.edu>
Wed, 7 Aug 2019 23:58:56 +0000 (16:58 -0700)
committerrtrimana <rtrimana@uci.edu>
Wed, 7 Aug 2019 23:58:56 +0000 (16:58 -0700)

Trivial merge