Gergely Csatari authored Nov 27, 2017 and Michele Carignani committed Dec 11, 2017

Change-Id: Ie44a72a9e9ded5acf6014dcf8018224149bb7e3c
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>