Change-Id: I8a56784d124137d51200bcb34ce063062f7645bd Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>