Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authoramiraj <amiraj.95@uci.edu>
Thu, 1 Aug 2019 22:58:37 +0000 (15:58 -0700)
committeramiraj <amiraj.95@uci.edu>
Thu, 1 Aug 2019 22:58:37 +0000 (15:58 -0700)

Trivial merge