Merge branch 'manager' into demo
authorPawel Wieczorek <p.wieczorek2@samsung.com>
Fri, 5 Jan 2018 12:06:53 +0000 (13:06 +0100)
committerPawel Wieczorek <p.wieczorek2@samsung.com>
Fri, 5 Jan 2018 12:06:53 +0000 (13:06 +0100)
Change-Id: I448fd297141fdbd46f11efea0f2595c174507aed


Trivial merge