Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authoramiraj <amiraj.95@uci.edu>
Tue, 6 Aug 2019 23:14:32 +0000 (16:14 -0700)
committeramiraj <amiraj.95@uci.edu>
Tue, 6 Aug 2019 23:14:32 +0000 (16:14 -0700)

Trivial merge