Merge branch 'hotfix/v01.00.00.02' v01.00.00.02
authorYuan Zhao <yuanzhao@ti.com>
Tue, 10 Jul 2018 15:26:24 +0000 (10:26 -0500)
committerYuan Zhao <yuanzhao@ti.com>
Tue, 10 Jul 2018 15:26:24 +0000 (10:26 -0500)

Trivial merge