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