Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authoramiraj <amiraj.95@uci.edu>
Fri, 28 Jun 2019 23:55:24 +0000 (16:55 -0700)
committeramiraj <amiraj.95@uci.edu>
Fri, 28 Jun 2019 23:55:24 +0000 (16:55 -0700)

Trivial merge