Change-Id: I1dfadc781485649bbc9c5b6c952297cdea80d95b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>