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

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