Merge '1.12.20' into tizen 71/244971/1
authorAdrian Szyndela <adrian.s@samsung.com>
Mon, 28 Sep 2020 11:52:20 +0000 (13:52 +0200)
committerAdrian Szyndela <adrian.s@samsung.com>
Mon, 28 Sep 2020 11:52:20 +0000 (13:52 +0200)
Change-Id: I69124bb712d62976218715a4d88db6196397a0fb


Trivial merge