Merge "Upgrade to 0.25.13" into devel submit/trunk/20200723.141412
authorChunhua Liu <chunhua1.liu@samsung.com>
Thu, 23 Jul 2020 02:51:34 +0000 (02:51 +0000)
committerGerrit Code Review <gerrit@review>
Thu, 23 Jul 2020 02:51:34 +0000 (02:51 +0000)

Trivial merge