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