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

   - Todo:
      - Review

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