Change-Id: I6bf87d313e5466ad782ed06662d5fe0039a79491 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>