Merge branch 'PRSDK-7120'
authorHao Zhang <hzhang@ti.com>
Mon, 9 Dec 2019 10:39:27 +0000 (05:39 -0500)
committerHao Zhang <hzhang@ti.com>
Mon, 9 Dec 2019 10:39:27 +0000 (05:39 -0500)

Trivial merge