Merge branch 'hotfix/v01.05.01' master v01.05.01
authorYuan Zhao <yuanzhao@ti.com>
Mon, 9 Mar 2020 16:36:45 +0000 (11:36 -0500)
committerYuan Zhao <yuanzhao@ti.com>
Mon, 9 Mar 2020 16:36:45 +0000 (11:36 -0500)

Trivial merge