Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authoramiraj <amiraj.95@uci.edu>
Thu, 8 Aug 2019 20:47:30 +0000 (13:47 -0700)
committeramiraj <amiraj.95@uci.edu>
Thu, 8 Aug 2019 20:47:30 +0000 (13:47 -0700)

Trivial merge