Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authoramiraj <amiraj.95@uci.edu>
Wed, 16 Oct 2019 22:21:54 +0000 (15:21 -0700)
committeramiraj <amiraj.95@uci.edu>
Wed, 16 Oct 2019 22:21:54 +0000 (15:21 -0700)

Trivial merge