Merge branch 'manager' 80/177380/1
authorPawel Wieczorek <p.wieczorek2@samsung.com>
Fri, 27 Apr 2018 12:14:49 +0000 (14:14 +0200)
committerPawel Wieczorek <p.wieczorek2@samsung.com>
Fri, 27 Apr 2018 12:22:15 +0000 (14:22 +0200)
Change-Id: I950cbd5ee07bb735ca5a8cfd46b1239039a70b31
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>

Trivial merge